testsuite: Fix some a11y output

This was affected by a recent fix to GtkAboutDialog.

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index 5add6017ca04c237dd8d21c05ac82418514fd2e1..d52758c483df395b7abc3eba3911b72ec9ce4a5e 100644 (file)
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -52,7 +52,7 @@ window1
           parent: box
           index: 1
           name: FancyPants
-          state: enabled focusable multi-line sensitive showing visible
+          state: enabled focusable focused multi-line sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
@@ -60,7 +60,8 @@ window1
           <AtkText>
           text: FancyPants
           character count: 10
-          caret offset: 0
+          caret offset: 10
+          selection 0: (0, 10) FancyPants
           default attributes: bg-color: <omitted>
                               bg-full-height: 0
                               direction: <omitted>
@@ -364,7 +365,7 @@ See the GNU General Public License, version 3 or later for details.
       "filler"
       parent: headerbar1
       index: 0
-      state: enabled horizontal sensitive showing visible
+      state: enabled horizontal sensitive
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -374,7 +375,7 @@ See the GNU General Public License, version 3 or later for details.
         parent: stack_switcher
         index: 0
         name: About
-        state: checked enabled focusable focused sensitive showing visible
+        state: checked enabled focusable sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
@@ -390,7 +391,7 @@ See the GNU General Public License, version 3 or later for details.
         parent: stack_switcher
         index: 1
         name: Credits
-        state: enabled focusable sensitive showing visible
+        state: enabled focusable sensitive
         toolkit: gtk
         <AtkComponent>
         layer: widget
@@ -422,7 +423,7 @@ See the GNU General Public License, version 3 or later for details.
         parent: stack_switcher
         index: 3
         name: System
-        state: enabled focusable sensitive showing visible
+        state: enabled focusable sensitive
         toolkit: gtk
         <AtkComponent>
         layer: widget

diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index ab604e243792c2eb503e6865dcafb2c7f0d1c9a8..e6e16e5b8c47e4a856b35b2fb73e8a74f4539407 100644 (file)
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -15,75 +15,6 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-  unnamed-GtkPopoverAccessible-1
-    "panel"
-    parent: menubutton
-    popup-for: menubutton
-    state: enabled modal sensitive
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    unnamed-GtkStackAccessible-2
-      "panel"
-      parent: unnamed-GtkWidgetAccessible-3
-      state: enabled sensitive visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      unnamed-GtkContainerAccessible-4
-        "filler"
-        parent: unnamed-GtkStackAccessible-2
-        index: 0
-        state: enabled sensitive vertical visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        unnamed-GtkContainerAccessible-5
-          "filler"
-          parent: unnamed-GtkContainerAccessible-4
-          index: 0
-          state: enabled sensitive vertical visible
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          unnamed-GtkContainerAccessible-6
-            "filler"
-            parent: unnamed-GtkContainerAccessible-5
-            index: 0
-            state: enabled sensitive vertical visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            unnamed-GtkContainerAccessible-7
-              "filler"
-              parent: unnamed-GtkContainerAccessible-6
-              index: 0
-              state: enabled sensitive vertical visible
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              unnamed-GtkButtonAccessible-8
-                "push button"
-                parent: unnamed-GtkContainerAccessible-7
-                index: 0
-                name: New
-                state: enabled focusable sensitive visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkImage>
-                image size: -1 x -1
-                image description: (null)
-                <AtkAction>
-                action 0 name: click
-                action 0 description: Clicks the button
   menubutton
     "toggle button"
     parent: window1

diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index ab604e243792c2eb503e6865dcafb2c7f0d1c9a8..e6e16e5b8c47e4a856b35b2fb73e8a74f4539407 100644 (file)
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -15,75 +15,6 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-  unnamed-GtkPopoverAccessible-1
-    "panel"
-    parent: menubutton
-    popup-for: menubutton
-    state: enabled modal sensitive
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-    unnamed-GtkStackAccessible-2
-      "panel"
-      parent: unnamed-GtkWidgetAccessible-3
-      state: enabled sensitive visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      unnamed-GtkContainerAccessible-4
-        "filler"
-        parent: unnamed-GtkStackAccessible-2
-        index: 0
-        state: enabled sensitive vertical visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        unnamed-GtkContainerAccessible-5
-          "filler"
-          parent: unnamed-GtkContainerAccessible-4
-          index: 0
-          state: enabled sensitive vertical visible
-          toolkit: gtk
-          <AtkComponent>
-          layer: widget
-          alpha: 1
-          unnamed-GtkContainerAccessible-6
-            "filler"
-            parent: unnamed-GtkContainerAccessible-5
-            index: 0
-            state: enabled sensitive vertical visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: widget
-            alpha: 1
-            unnamed-GtkContainerAccessible-7
-              "filler"
-              parent: unnamed-GtkContainerAccessible-6
-              index: 0
-              state: enabled sensitive vertical visible
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              unnamed-GtkButtonAccessible-8
-                "push button"
-                parent: unnamed-GtkContainerAccessible-7
-                index: 0
-                name: New
-                state: enabled focusable sensitive visible
-                toolkit: gtk
-                <AtkComponent>
-                layer: widget
-                alpha: 1
-                <AtkImage>
-                image size: -1 x -1
-                image description: (null)
-                <AtkAction>
-                action 0 name: click
-                action 0 description: Clicks the button
   menubutton
     "toggle button"
     parent: window1